synch_bitops.h is an arch-specific header file.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c b/linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c
index 6cb42af88a1847164508d24e93ed3bb95187102f..5926bcf99efbe71806643f785a96558c29402347 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c
+++ b/linux-2.6-xen-sparse/arch/xen/kernel/evtchn.c
@@ -37,7 +37,7 @@
 #include <asm/atomic.h>
 #include <asm/system.h>
 #include <asm/ptrace.h>
-#include <asm-xen/synch_bitops.h>
+#include <asm/synch_bitops.h>
 #include <asm-xen/xen-public/event_channel.h>
 #include <asm-xen/xen-public/physdev.h>
 #include <asm-xen/hypervisor.h>

diff --git a/linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c b/linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c
index 63080358d8eb1ff0fcf88c5c43504048fcd9c090..9d2db353a4fd219810c76030c2311a1d9c32d495 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c
+++ b/linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c
@@ -19,7 +19,7 @@
 #include <asm-xen/xen_proc.h>
 #include <asm-xen/linux-public/privcmd.h>
 #include <asm-xen/gnttab.h>
-#include <asm-xen/synch_bitops.h>
+#include <asm/synch_bitops.h>
 
 #if 1
 #define ASSERT(_p) \

diff --git a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/system.h b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/system.h
index 3aa047dc9de5a15065ceb83e6087796bcdf8644c..6c991e8058eb9b2cc05e76217326c921e69edaeb 100644 (file)
--- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/system.h
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/system.h
@@ -4,7 +4,7 @@
 #include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/bitops.h>
-#include <asm-xen/synch_bitops.h>
+#include <asm/synch_bitops.h>
 #include <asm/segment.h>
 #include <asm/cpufeature.h>
 #include <asm-xen/hypervisor.h>

diff --git a/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/synch_bitops.h b/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/synch_bitops.h
new file mode 100644 (file)
index 0000000..9b5d468
--- /dev/null
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/synch_bitops.h
@@ -0,0 +1,2 @@
+
+#include <asm-i386/synch_bitops.h>

diff --git a/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/system.h b/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/system.h
index c38dcb829f95791699c3761a353c635751e7b46c..518dcdf5a320c5ee5409a81016c00489f023b274 100644 (file)
--- a/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/system.h
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/system.h
@@ -4,7 +4,7 @@
 #include <linux/config.h>
 #include <linux/kernel.h>
 #include <asm/segment.h>
-#include <asm-xen/synch_bitops.h>
+#include <asm/synch_bitops.h>
 #include <asm-xen/hypervisor.h>
 #include <asm-xen/xen-public/arch-x86_64.h>
 

diff --git a/linux-2.6-xen-sparse/include/asm-xen/evtchn.h b/linux-2.6-xen-sparse/include/asm-xen/evtchn.h
index e38e6822c8eadfd399e3dda5fe33219a00c38499..ff522a927e73c2d747f87e6656247e79fade8ad8 100644 (file)
--- a/linux-2.6-xen-sparse/include/asm-xen/evtchn.h
+++ b/linux-2.6-xen-sparse/include/asm-xen/evtchn.h
@@ -35,7 +35,7 @@
 #include <linux/interrupt.h>
 #include <asm-xen/hypervisor.h>
 #include <asm/ptrace.h>
-#include <asm-xen/synch_bitops.h>
+#include <asm/synch_bitops.h>
 #include <asm-xen/xen-public/event_channel.h>
 #include <linux/smp.h>
 

diff --git a/linux-2.6-xen-sparse/include/asm-xen/synch_bitops.h b/linux-2.6-xen-sparse/include/asm-xen/synch_bitops.h
deleted file mode 100644 (file)
index 9b5d468..0000000
--- a/linux-2.6-xen-sparse/include/asm-xen/synch_bitops.h
+++ /dev/null
@@ -1,2 +0,0 @@
-
-#include <asm-i386/synch_bitops.h>